From: Michael Ellerman Date: Thu, 22 Feb 2018 12:35:43 +0000 (+1100) Subject: powerpc/64s: Fix conversion of slb_miss_common to use RFI_TO_USER/KERNEL X-Git-Tag: archive/raspbian/4.9.82-1+deb9u3+rpi1_jessie~8^2~87 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com//%22stanciumarius94%40gmail.com/%22/%22http:/www.example.com/%22stanciumarius94%40gmail.com/%22?a=commitdiff_plain;h=6a606f61e0d1239aa031b33c6838e3770b9e2a59;p=linux-4.9.git powerpc/64s: Fix conversion of slb_miss_common to use RFI_TO_USER/KERNEL The back port of commit c7305645eb0c ("powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL") missed a hunk needed to restore cr6. Fixes: 48cc95d4e4d6 ("powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL") Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman Gbp-Pq: Topic bugfix/powerpc Gbp-Pq: Name powerpc-64s-fix-conversion-of-slb_miss_common-to-use.patch --- diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 96db6c3adebe..d0be752ea86c 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -680,6 +680,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) .machine push .machine "power4" mtcrf 0x80,r9 + mtcrf 0x02,r9 /* I/D indication is in cr6 */ mtcrf 0x01,r9 /* slb_allocate uses cr0 and cr7 */ .machine pop